merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 26 Apr 2006 19:17:37 +0000 (13:17 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 26 Apr 2006 19:17:37 +0000 (13:17 -0600)
commit7a72b7c50b7c1f9d04db27bc0e68f59017e42b1d
tree7b4af18f7a56420a723dc8985d7f60c825d1def2
parent3307d6c2f1ce86bbfd11a9bdde97e6573af12a19
parentb450304086140f01d838368dfedc7fe2eddb67ef
merge with xen-unstable.hg